From 8cd417d4fba28decf078c969577596915f5b5b69 Mon Sep 17 00:00:00 2001 From: robertl Date: Wed, 8 Jul 2009 17:23:35 +0000 Subject: [PATCH] Bump version. Make beta tag. --- Makefile.in | 3 ++- configure | 22 +++++++++++----------- configure.in | 6 +++--- csv_util.c | 2 ++ gbversion.h | 4 ++-- jeeps/gpslibusb.c | 2 +- jeeps/gpsusbwin.c | 1 - kml.c | 7 +++---- nmea.c | 1 + vecs.c | 2 +- 10 files changed, 26 insertions(+), 24 deletions(-) diff --git a/Makefile.in b/Makefile.in index fdceed00c..f974c8a89 100644 --- a/Makefile.in +++ b/Makefile.in @@ -44,7 +44,8 @@ INSTALL_DIR=$(DESTDIR)/$(PREFIX) # OTHER_ROOT=/sw # Uncomment For Fink on OS X. MINIMAL_FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o garmin.o \ - garmin_device_xml.o garmin_tables.o internal_styles.o nmea.o kml.o + garmin_device_xml.o garmin_tables.o internal_styles.o nmea.o kml.o \ + wbt-200.o ALL_FMTS=$(MINIMAL_FMTS) gtm.o gpsutil.o pcx.o cetus.o copilot.o \ gpspilot.o magnav.o skytraq.o \ diff --git a/configure b/configure index 7a4bae7a6..39ea2c57f 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for GPSBabel 1.3.6. +# Generated by GNU Autoconf 2.61 for GPSBabel 1.3.7. # # Report bugs to . # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='GPSBabel' PACKAGE_TARNAME='gpsbabel' -PACKAGE_VERSION='1.3.6' -PACKAGE_STRING='GPSBabel 1.3.6' +PACKAGE_VERSION='1.3.7' +PACKAGE_STRING='GPSBabel 1.3.7' PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS' # Factoring default headers for most tests. @@ -1212,7 +1212,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GPSBabel 1.3.6 to adapt to many kinds of systems. +\`configure' configures GPSBabel 1.3.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1278,7 +1278,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GPSBabel 1.3.6:";; + short | recursive ) echo "Configuration of GPSBabel 1.3.7:";; esac cat <<\_ACEOF @@ -1375,7 +1375,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GPSBabel configure 1.3.6 +GPSBabel configure 1.3.7 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1389,7 +1389,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GPSBabel $as_me 1.3.6, which was +It was created by GPSBabel $as_me 1.3.7, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1745,7 +1745,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Increase GBBUILD for a new release GBBUILD=20 # YYYYMMDD, please, if beta, i.e. "-beta20060413" -# PACKAGE_RELEASE="-beta20081006" +PACKAGE_RELEASE="-beta20090708" cat >>confdefs.h <<_ACEOF #define PACKAGE_RELEASE "$PACKAGE_RELEASE" @@ -1755,7 +1755,7 @@ _ACEOF DOCVERSION=`echo $PACKAGE_VERSION` DOCVERSION=development -DOCVERSION=1.3.6 +#DOCVERSION=1.3.6 GBMAJOR=`echo $PACKAGE_VERSION | (IFS="."; read major minor micro; echo $major)` @@ -5331,7 +5331,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GPSBabel $as_me 1.3.6, which was +This file was extended by GPSBabel $as_me 1.3.7, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5380,7 +5380,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -GPSBabel config.status 1.3.6 +GPSBabel config.status 1.3.7 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index 3136eccb1..77d3a3a9e 100644 --- a/configure.in +++ b/configure.in @@ -3,17 +3,17 @@ AC_PREREQ(2.59) -AC_INIT(GPSBabel, 1.3.6, BUG-REPORT-ADDRESS) +AC_INIT(GPSBabel, 1.3.7, BUG-REPORT-ADDRESS) # Increase GBBUILD for a new release GBBUILD=20 # YYYYMMDD, please, if beta, i.e. "-beta20060413" -# PACKAGE_RELEASE="-beta20081006" +PACKAGE_RELEASE="-beta20090708" AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.]) AC_SUBST(PACKAGE_RELEASE) DOCVERSION=`echo $PACKAGE_VERSION` DOCVERSION=development -DOCVERSION=1.3.6 +#DOCVERSION=1.3.6 AC_SUBST(DOCVERSION) GBMAJOR=`echo $PACKAGE_VERSION | (IFS="."; read major minor micro; echo $major)` diff --git a/csv_util.c b/csv_util.c index e824a020c..66ed7ad6e 100644 --- a/csv_util.c +++ b/csv_util.c @@ -138,12 +138,14 @@ xcsv_file_t xcsv_file; extern char *xcsv_urlbase; extern char *prefer_shortnames; +#if CSVFMTS_ENABLED static double pathdist = 0; static double oldlon = 999; static double oldlat = 999; static int waypt_out_count; static route_head *csv_track, *csv_route; +#endif // CSVFMTS_ENABLED /*********************************************************************/ /* csv_stringclean() - remove any unwanted characters from string. */ diff --git a/gbversion.h b/gbversion.h index abf2c56a7..a53279c15 100644 --- a/gbversion.h +++ b/gbversion.h @@ -4,5 +4,5 @@ * * Isn't simplification via automation grand? */ -#define VERSION "1.3.6" -#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.3.6" +#define VERSION "1.3.7-beta20090708" +#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-development" diff --git a/jeeps/gpslibusb.c b/jeeps/gpslibusb.c index 3203e463c..3833c3b96 100644 --- a/jeeps/gpslibusb.c +++ b/jeeps/gpslibusb.c @@ -270,7 +270,7 @@ garmin_usb_start(struct usb_device *dev, libusb_unit_data *lud) * Hrmph. No iManufacturer or iProduct headers.... */ - + #if __APPLE__ // On Leopard, if we don't do an explicit set_configuration, some // devices will work only the first time after a reset. diff --git a/jeeps/gpsusbwin.c b/jeeps/gpsusbwin.c index 3bcbe5fca..8e5b44ea9 100644 --- a/jeeps/gpsusbwin.c +++ b/jeeps/gpsusbwin.c @@ -292,4 +292,3 @@ gusb_init(const char *pname, gpsdevh **dh) gusb_list_units(); exit (0); } - diff --git a/kml.c b/kml.c index 5a9a23291..a026b3161 100644 --- a/kml.c +++ b/kml.c @@ -413,14 +413,14 @@ static void kml_write_bitmap_style_(const char *style, const char * bitmap, highlighted ? "Highlighted" : "Normal", style); kml_write_xml(1, "